Merge "Check more URIs in notifications" into sc-dev am: 9b874d3559 am: 01b4536dd1 am: a12cfb552e am: cf887f5294 am: 30ee8b3b04

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

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