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: 1d4288c0 am: 9fb953db am: a73de9d7

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



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