[automerger skipped] Merge "Visit Uris related to Notification style extras" into udc-dev am: 5526f06684 am: 1ea5cc8934 -s ours

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

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

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