Merge "Fix tapping magnification crash in vision settings setup screen" into...

Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b am: f4816373

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



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