Merge "Use a generic label & icon for the assistant shortcut." into udc-dev am: 30123d5f

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



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