[automerger skipped] Merge "fix(#Magnification): fix...

[automerger skipped] Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest test case fails on cf_x86_64 devices" into main am: 8eb8a951 am: 3b6bf684 am: d25f3aa7 am: 8be442c9 am: ba882dbe am: 5ed29f98 -s ours

am skip reason: Merged-In If0ea2df64f58b9032d629446da74c15b6e691db5 with SHA-1 82febd2b is already in history

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



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