Merge "BroadcastReceiver in UserBackupManagerService can crash system_server" into qt-dev am: 451e2d843d
am: a92bb9fa57

Change-Id: Iff4ab17ffc0746a653859af6acf1bb8e9d384890