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

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

Change-Id: I18ec3c9dccc47632e3e8b9cbbdce530a3f454e97