Merge "Move Accounts NotificationChannel earlier, before clearCallingIdentity"