Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev am: 6de9b2486f

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

Change-Id: I9fdf101e209d7ade30c3da5850ed4499d7fcca3d