[automerger skipped] Updated keyguard to be robust against fpm am: bfd27670...

[automerger skipped] Updated keyguard to be robust against fpm am: bfd27670 -s ours am: e92f1e97 -s ours am: d946867d -s ours

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

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



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