Merge "Fix OWNERS issues" am: dc1832cd83 am: 686a490f9f

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

Change-Id: I154ca05fba6f4d08fb7260b6d6f9706de6d5fef6