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

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

Change-Id: Ieb495505e703e16d3ace3dcbf87b58e11cc6703c