Merge "Move override logic from SysUI to Telephony"