[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d073492 am: c48e25fdbe am: 43174fbd70 -s ours am: ff41ae871d -s ours am: 17a9444321 -s ours am: b50e1c3115 -s ours am: 81ea034678 -s ours

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

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

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