am 35182905: Merge "Fix WPS handling when already connected" into jb-mr2-dev
am 35182905: Merge "Fix WPS handling when already connected" into jb-mr2-dev

* commit '35182905df4d1adb973621af61c831439f0b929b':
  Fix WPS handling when already connected

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