[automerger skipped] Merge "Check URIs in notification public version." into rvc-dev am: 6f9b881abb am: 0213c11eb4 -s ours am: 288440629b -s ours

am skip reason: Merged-In I670198b213abb2cb29a9865eb9d1e897700508b4 with SHA-1 67cd169d07 is already in history

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

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