Merge "fix(#Magnification): fix...

Merge "fix(#Magnification): fix WindowMagnificationControllerTest#enableWindowMagnification_rotationIsChanged_updateRotationValue fails on x86 devices" into udc-dev am: 580eb729

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



Change-Id: I2a71c40da00e0a9762c572860564ebee4b1cfad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>