[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e164f5f0ae -s ours

am skip reason: Merged-In If04ba3970a7a3236beb31ad50d96ff576aa8dec4 with SHA-1 9eaa7a5550 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/2186746

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