Merge "Fix mistake in onActivityResult for ConfigureWifiSettings" into pi-dev am: 1678488736
am: 230d6420b9

Change-Id: I5a05e1bf619b4999d3f329dcc6ce267dba95e598