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

[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d0734 am: c48e25fd am: 43174fbd -s ours am: ff41ae87 -s ours am: 93942dc9 -s ours am: 7dd15d33 -s ours

am skip reason: Merged-In I25acab19be7dd486aabede8c91dbad5a1a217abf with SHA-1 3c2ebb81 is already in history

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



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