Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev
am: de08983dd2

Change-Id: I3991de744ca033132d44f7456be126b2603f11c9