[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 -s ours am: 83d28ff7 -s ours am: 6906b7fb -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: I500f5570981c6ddffc2edf1c7f8d1aaf3254a5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>