Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 am: 9a4f3c85be am: 6ef49b92d1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675865

Change-Id: Ice209b14a61b730a0ea6066f7ae727e424db343f