Merge "Fixes fail test cases in AccessibilitySettingsTest" into udc-dev am: 5f87e3bb

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



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