Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours" am: 85107fb372 -s ours am: 0fae732b4f -s ours
am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 17df79ccc0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061638
Change-Id: I1041ae1a415355e924254303db316e8fb3056b46
This commit is contained in: