[automerger skipped] Merge "Merge Android R" am: a81b123780 -s ours am: 888d0531c2 -s ours am: 6db6de3080 -s ours

am skip reason: Change-Id Idd09cd2ecd3045625f3c10c41cad2f2af7850dd5 with SHA-1 7e7631299c is in history

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

Change-Id: I3cbd1874474a70fce8f8acff8188b24b55d12742