Merge "[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d073492 am: ccc258c835 -s ours am: b34e174898 -s ours am: f5d96ff8fa -s ours" into udc-d1-dev-plus-aosp am: 61b83f23ab -s ours am: d98282cc55 -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: Ifafb8a11b8976f8b8c8acbcb64e822e33b6aff1d
Signed-off-by: Automerger Merge Worker <[email protected]>