Merge "Merge "Ensure app op restrictions reset when the app that set them dies." into nyc-dev am: 008d73bd5b am: 5f8c5ec9a4" into nyc-mr1-dev-plus-aosp
am: 1d26925e8c
* commit '1d26925e8c2d9c3b5260f31586360120b3caeb62':
Change-Id: I7740dcd60c653c72744ea4bbcdb79d589b303cdc
This commit is contained in: