Merge "fix(#Magnification): flaky presubmit error on...

Merge "fix(#Magnification): flaky presubmit error on FullScreenMagnificationGestureHandlerTest" into udc-qpr-dev am: 22f2d312 am: 3b4a489a

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



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