Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev am: ad697c41a1

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

Change-Id: I0a36b8327faa14ee6af64f9720308557dab5af43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>