[automerger skipped] Merge "Perform magnification viewport drawing outside of...

[automerger skipped] Merge "Perform magnification viewport drawing outside of WM global lock." into udc-dev am: 419fcfd9 am: 454dbf12 -s ours am: 26564106 -s ours am: 1aa8606b -s ours

am skip reason: Merged-In Id828744c8c5bcb4bdb3be9a11810338614b84b2e with SHA-1 6ae1113e is already in history

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



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