Merge "Allow extra keyguard logs to be enabled via adb" into sc-v2-dev