[automerger skipped] Merge "Visit Uris related to Notification style extras"...

[automerger skipped] Merge "Visit Uris related to Notification style extras" into rvc-dev am: 0f020dea am: 35a82e87 -s ours am: e079cfc5 -s ours

am skip reason: Merged-In I25acab19be7dd486aabede8c91dbad5a1a217abf with SHA-1 87db980c is already in history

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



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