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

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



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