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

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

Change-Id: Ide92c3d2ee173cc1cdeaa8b10a41dbe8e9152e75