Merge "Use ImageButtons instead of Buttons in handle menu" into tm-qpr-dev am: 5df29339

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



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