Merge "Check more URIs in notifications" into sc-dev am: 9b874d3559

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

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