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

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



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