[automerger skipped] Merge android14-tests-dev am: 11ee4fea87 -s ours am: cb7c1fe981 -s ours

am skip reason: Merged-In I770dc5620648df2eab608e030c5e76cf190f315d with SHA-1 a47d46affb is already in history

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

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