Merge "Modify Wi-Fi SettingsLib owners file" am: d2aa5c594b am: daec1e65cd

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

Change-Id: I9123cc8cfa5c0e247791afab59375dfc19c9f58a