Merge "Check more URIs in notifications" into sc-dev am: 9b874d35 am: 01b4536d am: a12cfb55

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



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