[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: baaa71d89f -s ours am: 7933bf90bc -s ours

am skip reason: Merged-In Ib1c25d524d8ca64d491212edb0625a6541ec6a3f with SHA-1 e68a656969 is already in history

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

Change-Id: Ib77e0667b367ee21c1f4801f3700f24c506c36ac