Merge commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557' * commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557': Fix issue #2834005: Android Settings.Secure bypass
Merge commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557' * commit 'b0e787d2d67d1214b3233b822a5ed2517c8e0557': Fix issue #2834005: Android Settings.Secure bypass