[automerger skipped] Merge "Updated keyguard to be robust against fpm" into...

[automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba am: 5f73e94b -s ours am: 9c0bc3d8 -s ours

am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 bfd27670 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058



Change-Id: I94dc24ac819fd1fc53474bf8d94fd3955dbe6fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>