Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857 am: 6b79d2a9 am: 71983fa1 am: cc3a7499

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



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