Merge "Merge "WiFi: Modify OWNERS files" into udc-dev am: 38f72971 am: 2a9b7bdc am: cda31e9e" into udc-qpr-dev-plus-aosp am: 37319c09

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



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