[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 64cc7f0eea -s ours am: 361f6ce91b -s ours am: 6b3a6f79e6 -s ours am: dfba6ed62c -s ours

am skip reason: Merged-In I546ac3bad491e4950d192f8b3f4a20bc3ff5534f with SHA-1 0000c58327 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/19092905

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