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

Change-Id: Ia9bd1739203684ece631c53f6cdd1ab6d26e0f1c