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: 4f968024
* commit '4f968024':
Ensure app op restrictions reset when the app that set them dies.
Change-Id: Ia7acd68dfd29d855e26f11a36e04dde153055d62