Merge "Updated keyguard to be robust against fpm" into tm-qpr-dev am: 23e80323 am: 50d6dcf9

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



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