[automerger skipped] Merge "Check more URIs in notifications" into sc-dev am:...

[automerger skipped] Merge "Check more URIs in notifications" into sc-dev am: 9b874d35 am: 01b4536d am: a12cfb55 am: cf887f52 am: 0a3dcfee am: 3029fa1a am: 4adccaae -s ours

am skip reason: Merged-In I1ce6bebd9452466d005505dc5b99a0fdc0e05e80 with SHA-1 f47b41a1 is already in history

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



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