[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 04480d28d1 am: 4a084264d7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3393bbb3562d4d91ee13af2b9bb7f1297bf950b5