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: I225eb317a7b23e161f579211c787a54ce85f3ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>