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

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



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