[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 3f06080d98 -s ours

am skip reason: Merged-In I3b70abe456b9af7a5b4aadfc4ce8a9c934c34ac6 with SHA-1 d93f634563 is already in history

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

Change-Id: I9c1e63ffd297d2d73b7b70c7e3846439d4d902f1