tree 32c1e976e824695c0437cd5cd48bbc973226d467
parent 89fb4563d291d4471f409323efb583693083e8c8
parent 789ff12ec1dc29d0295ba67c584993e2ab0f2f9b
author Abhijeet Kaur <abkaur@google.com> 1614189654 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614189654 +0000

Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" am: 789ff12ec1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f57d8dd875390671527f46df93b5366133d946c