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

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

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