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: I66570d28038c4e179238872f8ea33c2c1c909ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>