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

Merge "Check more URIs in notifications" into sc-dev am: 9b874d35 am: 01b4536d am: a12cfb55 am: cf887f52 am: 0a3dcfee am: 3029fa1a

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



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