Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9 am: 37be325d99

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713

Change-Id: Ic856efa4218938ba4b05d0003fcd266f6e5f1a42