[automerger skipped] Merge "Disable resetting WRITE_MEDIA_IMAGES and WRITE_MEDIA_VIDEO appops" am: 789ff12e am: a544a575 am: 08779674 -s ours am: bbe2b09a -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a3d83fafc3eb69cdd7e9e3db30b75b178e0e8c1