Merge "WiFi: Modify OWNERS files" into udc-dev am: 38f7297166 am: cb184c545b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23442432

Change-Id: I47a6bb7d673e435f9beecd06b17ff6ca2d680133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>