Merge "Visit Uris related to Notification style extras" into tm-dev am: 6f0d073492 am: c48e25fdbe

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

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