Merge "Fix surface crop being wrong after rotation" into udc-dev am: 974c3d95 am: 1d4288c0

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



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