[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6baf6155b7 -s ours

am skip reason: Merged-In I0ff1481d841f5d49346264aa7140ec097d2718ad with SHA-1 a4acd5830b is already in history

Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/2185744

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