[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 6653b9e537 -s ours

am skip reason: Merged-In Id72d677611dc019a1658f7e6bd0cca345d6af7d6 with SHA-1 5598cc4067 is already in history

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

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