Merge "Fix OWNERS issues" am: dc1832cd83

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2022776

Change-Id: Iafc9c40c49f2087f1ae552ef1f5a7cfee0a16364