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

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



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