Merge changes from topic "magnification_switch" into sc-dev am: b23e8bc3 am: df94776f am: 46acaf6d

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

Change-Id: I448d04ed815ce187da9bb767326fe925835dff76