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

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

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



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