Merge "Use notes role app icon as a shortcut badge" into udc-dev am: a9eab435 am: 12744cca

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



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