Merge "[automerger skipped] Merge "Check URIs in notification public version."...

Merge "[automerger skipped] Merge "Check URIs in notification public version." into rvc-dev am: 6f9b881a am: 0213c11e -s ours am: 28844062 -s ours am: 279bdb81 -s ours am: d6048ac3 -s ours am: a982233f -s ours am: 7037009a -s ours am: dc1fee31 -s ours am: b2e898ab -s ours" into udc-dev-plus-aosp am: f18e1044 -s ours am: 7a8118d8 -s ours am: 0b0ed621 -s ours

am skip reason: Merged-In I670198b213abb2cb29a9865eb9d1e897700508b4 with SHA-1 9663d493 is already in history

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



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