Merge "Fix surface crop being wrong after rotation" into udc-dev am:...

Merge "Fix surface crop being wrong after rotation" into udc-dev am: 974c3d95 am: 2ff3b2a1 am: bcb1f7eb am: c738cac7

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



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