Merge changes from topic "accessibility1" into tm-qpr-dev am: 9b24df2c am: 83ef9001

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19771692



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