Merge "Move config_isSafetyCenterLockScreenPendingIntentFixed"