[automerger skipped] Merge "Check URIs in notification public version." into rvc-dev am: 6f9b881abb am: 0213c11eb4 -s ours am: 288440629b -s ours am: 279bdb8103 -s ours am: d6048ac367 -s ours am: a982233f51 -s ours am: 7037009a1d -s ours am: dc1fee31dd -s ours am: ba7e2d6d47 -s ours am: eefd8a42d0 -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: I8ee59efe4ca09ffba494861e374c4fe10334f4ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>