am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and...
am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit 'b00540dc':
Clarify javadoc of isKeyguardSecure and isDeviceSecure