Merge "Ensure app op restrictions reset when the app that set them dies." into...
Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd
am: 5f8c5ec9
* commit '5f8c5ec9':
Ensure app op restrictions reset when the app that set them dies.
Change-Id: I2666118c42a1d67b9e7e6751e627624fff8cdaa1