Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb...

Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a81 -s ours" am: 85107fb3 -s ours am: 0fae732b -s ours am: 27229f05 -s ours am: d92834f5 -s ours am: b93710eb -s ours

am skip reason: Merged-In I29bb0ffefd57d577b5abe942e227eb2b5baeab4e with SHA-1 17df79cc is already in history

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

Change-Id: I04e8a152a889cb31ecc1407111c9b172aae91bdc