Merge "Fix OWNERS issues" am: dc1832cd83 am: ac58a96c4a

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

Change-Id: Id643e15842831b160ea9284a875b4f8579dbfac2