Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba

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



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