[automerger skipped] Merge "SurfaceFlinger: captureScreen buffer set...

[automerger skipped] Merge "SurfaceFlinger: captureScreen buffer set GRALLOC_USAGE_HW_COMPOSER usage" am: 05f351cb am: bdc325c6 am: 6267c1b1 am: ac71ee5b -s ours

am skip reason: Change-Id I73addd5058924a370965f7d704c6bcf05848d821 with SHA-1 cbcb8951 is in history

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

Change-Id: Id82696d0627b57844a3921df2c9165e05ab2ca65