[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 86b097544b -s ours

am skip reason: Merged-In I75000e0d23cfa02445f2f076fba711d6eb64e2f2 with SHA-1 469a1bfb4d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gfxstream-protocols/+/20948826

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