[automerger skipped] Merge "Merge Android 12" am: 9a7915509a -s ours

am skip reason: Merged-In I18fafce9c9c2f412a44dcf9455d886c398c8011a with SHA-1 d40f53277f is already in history

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

Change-Id: Ie4772a94c3d99b4e19810a984a099f143bd0e746