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

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

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