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