Merge "Fix captureDisplay when the display is rotated" into udc-qpr-dev am: fd2a709b

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



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