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

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

Change-Id: I4ca6e91aeba1cf349255101c0fe1629dc80aeaee