Merge "LockscreenCredential: clarify Effective Java rule"