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

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



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