Merge "Fix USAGE_FRONT_BUFFER failure on Cuttlefish" into udc-dev am: 1889c6a8 am: 5a7bedd2

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



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