[automerger skipped] Merge "Visit Uris related to Notification style extras" into rvc-dev am: d54ba94 am: 65d3361 -s ours am: e81dd29 -s ours am: 0e08d60 -s ours am: dac52a0 -s ours am: 524ecb8 -s ours am: 27e8b4d -s ours am: 1f1acd0 -s ours am: fed8579 -s ours am: 93b24cc -s ours

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

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

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

Author: Matías Hernández