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

am skip reason: Change-Id Icc53c3188ddda7da98959ef439105f33fe49ed62 with SHA-1 04480d28d1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida39743601fcb033082c966d73d8f2a47b517842