[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: ccc258c8 -s ours am: b34e1748 -s ours am: d9e7221a -s ours am: 3ce2cc45 -s ours

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

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



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