tree c5338d6c82d73f83de157e7395aff7a03cf5f58c
parent b036952896c8eff19b57ff965e018f62d3d5fa2b
parent 0e8f1fa5e915a62dc51974ff6445572d830235cd
author Suprabh Shukla <suprabh@google.com> 1569637907 -0700
committer android-build-merger <android-build-merger@google.com> 1569637907 -0700

[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
am: 0e8f1fa5e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I53678027aa329651d6d6c9652aee847ee36b9b30