[automerger skipped] Merge "Merge Android R" am: a81b123780 -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: I5e65eb8f6b3f1af494d02144ca2b9a281836b777