Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours" am: 85107fb372 -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: I95b6ae007a1f866a20ef2cfaf878b1bc871bf69a
This commit is contained in: