Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev...
Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev am: fc2a7ce7 am: b396f36b
am: 1bbc2a1f
* commit '1bbc2a1f':
Change-Id: I4b24142ffe3a9dde9ae979b5a27f8fefec82581b