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

[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: 4dcea225 -s ours am: d36c4c95 -s ours am: 4c4fc9fa -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/+/24420396



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