[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours am: ee5bb9efd6 -s ours am: d3be86fe68 -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: Ieee8a7bb24797ed1fdf9790d96d9c675aee25b3c