Merge "Add new method to differentiate custom notifications" into udc-dev am:...

Merge "Add new method to differentiate custom notifications" into udc-dev am: bda9feab am: 697b7bd6

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



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