Merge "Fix accessibility labels for icon buttons" into tm-qpr-dev am: c3a40b49

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



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