Merge "Make part of KeyguardSecurityContainer protected" into nyc-dev