Merge "SurfaceFlinger: captureScreen buffer set GRALLOC_USAGE_HW_COMPOSER usage" am: 05f351cb83 am: bdc325c604 am: 6267c1b16b

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

Change-Id: Ieaa9e43a8204d6bf6cdfda9049324efe07b328d8