Merge changes from topic "am-e6a69b5389d94198ad3af6a9c620422e"

* changes:
  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
  [automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a81 -s ours am: ee5bb9ef -s ours am: d3be86fe -s ours am: cfe2e74f -s ours am: dfc4b76b -s ours