Merge "Perform magnification viewport drawing outside of WM global lock." into...

Merge "Perform magnification viewport drawing outside of WM global lock." into udc-dev am: 419fcfd9

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



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