Merge "Disable car mode should not require DISABLE_KEYGUARD permission"