Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest test case fails on cf_x86_64 devices" into main am: 8eb8a95171 am: 3b6bf6842b

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

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