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

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

Change-Id: I623ba2087ee0570855dda59c2c32220202129558