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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaab487ae73afa6d5fca37790b8403f4cf706f2f8