[automerger skipped] Merge "gpu_counter_producer: Remove unnecessary c flags" into udc-dev-plus-aosp am: 2c20bc82 am: 89360146 am: 8d9bcce4 -s ours

am skip reason: Merged-In If723215882c332a7e2cb51ab425d7031a26d87c3 with SHA-1 137b2050 is already in history

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



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