Merge "Verify URI permissions in MediaMetadata" into udc-dev am: 9dd2c381 am: 251ec92e am: 27fc4f0f am: 0ee7dab8

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



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