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: 33f655d0

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



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