[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: a8d397120d -s ours am: 58931b541f -s ours am: bf15b82ffc -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6e32cd1819bed71249c4af2d40725b35755a6a8