Merge "[Wi-Fi] Update owners of settingslib/wifi" am: dbdaa06d90
am: 61ccbaca94

Change-Id: Ibc75dc1d33aa0bb05fc473de825c0212668d7533