Merge "UserManager.setUserName: clearCallingId pre-Broadcast"