[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d073492 am: ccc258c835 -s ours am: b34e174898 -s ours am: d9e7221a86 -s ours am: 3ce2cc454b -s ours am: d81352ce8f -s ours

am skip reason: Merged-In I25acab19be7dd486aabede8c91dbad5a1a217abf with SHA-1 3054c3ba40 is already in history

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

Change-Id: I387bcaa217d2fc78067fef239a72d036414b690c
Signed-off-by: Automerger Merge Worker <[email protected]>