Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e35198d

Change-Id: I83e9cfc0f7b71f36f447dd4c4b5fa7b66ae3d11c