am 14eb3701: Merge "Sync up state with supplicant at start"
am 14eb3701: Merge "Sync up state with supplicant at start"

* commit '14eb3701c2424b9cc22b9776d656a3f1ce1ed795':
  Sync up state with supplicant at start

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base