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

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



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