tree 4fc9f4e2831d6b1851094a628ec304e7b90a5151
parent 6776c214d28b05391290392aca7c5bcd1291f066
parent 804642bd6c99e998e9b176808253d3d4e4c7c4f9
author Abhijeet Kaur <abkaur@google.com> 1614271848 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614271848 +0000

[automerger skipped] Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" into rvc-qpr-dev am: 804642bd6c -s ours

am skip reason: Change-Id I168221c641566a9f691ed7956c038206b114d802 with SHA-1 953d180af7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If03cc727aad9e193ace74112b6222d256d0457c9