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