Merge commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3' * commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3': Don't block in the BackupManagerService.dataChanged() Binder call.
Merge commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3' * commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3': Don't block in the BackupManagerService.dataChanged() Binder call.