Merge "Tweak OWNERS list" am: e7f2f671ea am: 6e8741cc1b

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

Change-Id: Ice6c48c267f3af680e7ef4401727336b0eb404ef