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: c48e25fd am: 43174fbd -s ours am: ff41ae87 -s ours am: 17a94443 -s ours am: ef4b10d1 -s ours" into udc-qpr-dev-plus-aosp am: 5de354b1 -s ours

am skip reason: Merged-In I25acab19be7dd486aabede8c91dbad5a1a217abf with SHA-1 87db980c is already in history

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



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