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

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



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