Merge "Fix MUT cannot connect to AP by WPS after rotating MUT"
am: 2503ea04fb

Change-Id: Ic3daed07e1d94ad7f4154affe51855d0462753a6