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

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

Change-Id: Ib2308be4afab8ee76b697659389edc07f7435231