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: bb93a334 am: 3dad1383 am: 413bb7d5

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



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