[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d073492 am: ccc258c835 -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: I0d52b842a00bedf0dc3a6d2e246f06ea66598221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>