Merge "Fix USAGE_FRONT_BUFFER failure on Cuttlefish" into udc-dev am:...

Merge "Fix USAGE_FRONT_BUFFER failure on Cuttlefish" into udc-dev am: 1889c6a8 am: 3d1c934e am: 2aeec940 am: ab908705

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



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