[automerger skipped] Merge "Visit Uris related to Notification style extras"...

[automerger skipped] Merge "Visit Uris related to Notification style extras" into udc-dev am: 5526f066 am: aac338f9 -s ours am: 68158102 -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/+/24405959



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