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