Merge "Fix ClassCastException when users starts A11y vision settings from out...

Merge "Fix ClassCastException when users starts A11y vision settings from out of setup flow" into udc-dev am: bb5f8cef

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



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