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

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



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