Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev