[automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 -s ours
am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19347058
Change-Id: I65890595300454d8e7b4c52476337ca6ca0a1f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: