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

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



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