Merge "Always use OWNERS from master branch." am: d8d887bd39 am: 4e3fc8468b

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

Change-Id: I8410d814ca0b8bdc1d22d4877aa690bd13070177