Merge "Fix WindowMagnificationControllerTest failure on foldable targets" into sc-v2-dev am: 7aedd37457

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

Change-Id: I0c94a925a8acd814e3136bb5568f3ece1e5221ed