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: cdb9c781 am: 1132fd54

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



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