Merge "Check more URIs in notifications" into sc-dev am: 9b874d3559 am: 01b4536dd1 am: a12cfb552e am: cf887f5294 am: 0a3dcfeed5 am: 3029fa1a6f

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

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