Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev am: cf758119

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14484646

Change-Id: If310da9ee28c30727872244d4b9051246b9dc671