Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
am: f7980fc3cb

Change-Id: I0b9866922e764afba8f0b642fa16531cd48b73c0