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

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

Change-Id: Ic4f49ab4da423ca11b5ef8c449cf09d6fe378ed7