Merge "HWC screencap portability improvement" into main am: 5f9c7861f3

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

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