Merge "Correct magnification switch button position after screen size is...

Merge "Correct magnification switch button position after screen size is changed" into sc-v2-dev am: 35849cd0 am: 9231c7fc

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

Change-Id: I4cfe370808463f6917117309b2220fda341d614d