[automerger skipped] Merge "Created typed class pin result in keyguard" am:...
[automerger skipped] Merge "Created typed class pin result in keyguard" am: d2b38018 am: f2890488 -s ours am: 34e67252 -s ours
am skip reason: Change-Id I0d1354fadda4143260f377ff8ff868b99b9c53d8 with SHA-1 b663fcbf is in history
Change-Id: I7958ea8489f0e3eb2ab2e269aba8e52a3432fd1c