Merge "Visit Uris related to Notification style extras" into rvc-dev am: 0f020dea

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



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