Merge "Add icon to the context menu" into udc-dev am: 0b6a3fda

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



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