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

Merge "Perform magnification viewport drawing outside of WM global lock." into udc-qpr-dev am: 861cc9ab

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



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