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