Merge "Visit Uris related to Notification style extras" into udc-qpr-dev am: 95404508

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



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