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

Merge "[automerger skipped] Merge "Visit Uris related to Notification style extras" into sc-dev am: 3a4398cf am: dc8e7dc5 am: 541ea84b -s ours am: 044bc66a -s ours am: f408e79b -s ours am: 30610b02 -s ours am: 608dce64 -s ours am: 952875c0 -s ours" into udc-qpr-dev-plus-aosp am: 1b46278e -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/+/24420396



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