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: 5deacef4

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



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