Merge "Tweak OWNERS list" am: e7f2f671ea

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

Change-Id: Ia6669391072f3c562ab4846e67deca477978709b