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

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



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