Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee am: 314611d1 am: c7ef8fe1

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: Iaeaa54935fce43ed5f6144a7d253ae13aa6f92d2