Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857 am: 5eed876a am: 6245db18 am: 7fccb2fc

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



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