Merge "Check URIs in notification public version." into udc-dev am: 3b585fc1 am: 5842890d am: 8fd1bc25 am: dc2adf98

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



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