[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: d1b17caa -s ours am: 455ca187 -s ours
am skip reason: Change-Id I0d1354fadda4143260f377ff8ff868b99b9c53d8 with SHA-1 b663fcbf is in history

Change-Id: If66238c5c0f024672b028c6034ccd725d448c391