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

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

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