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

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

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