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

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

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



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