Merge "Fix OWNERS issues" am: dc1832cd83

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

Change-Id: Ib2745e66a5466ea4f69b89c9da159bffd46f4549