[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 38e932a8c1 -s ours am: fb99d7313a -s ours am: b68041aaed -s ours

am skip reason: Merged-In Ic10f3ebbff02cfb34b0dc3a94bed9da9c2bf7a3b with SHA-1 538896cdff is already in history

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

Change-Id: Ie5ddff1633d47b3dc0bae8d3da7d8c01884538d9