[automerger skipped] Merge "Merge Android 12 QPR1" am: 1b43aadaeb -s ours am: 7ed5a10fc8 -s ours am: 2734eb73f2 -s ours am: 0c444fe3ff -s ours

am skip reason: Merged-In I17688436501ef743e1c322453dfeedddf796bba7 with SHA-1 38e932a8c1 is already in history

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

Change-Id: Ie5efc1d3ded21372237f0ed7a9f88be90a13def3