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

Merge "[automerger skipped] Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d0734 am: ccc258c8 -s ours am: b34e1748 -s ours am: f5d96ff8 -s ours" into udc-d1-dev-plus-aosp am: 61b83f23 -s ours

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

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



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