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

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

Change-Id: I5b73f4ca105ae2584db008e87372dd52f4c2211c