Merge "[automerger skipped] Allow extra keyguard logs to be enabled via adb am: 2dcb5a8188 -s ours"