[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 skip reason: Change-Id I0d1354fadda4143260f377ff8ff868b99b9c53d8 with SHA-1 b663fcbf is in history
Change-Id: I7e60b19fdc115980ce56c2d93a6845f4fcf2a8e5