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