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

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



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