[automerger skipped] Updated keyguard to be robust against fpm am: bfd27670ae -s ours am: e92f1e97c5 -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: Ic2c75f139c9fdb746db901aa6c4b08cb2ed7c4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: