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

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

Change-Id: I26ec52be811224269913a3d0703b0b557b2c7262