Merge "Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857 am:...

Merge "Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857 am: 6b79d2a9" into udc-d1-dev-plus-aosp am: 80315f9e

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



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