[automerger skipped] Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 am: dfcd502487 -s ours am: f1200c65d8 -s ours am: 9c6a1bc912 -s ours
am skip reason: Change-Id I8b65f621abe20799a3a0d410ba1f06368746ee49 with SHA-1 bdf1003c3b is in history
Change-Id: I2ffda71d79d59aa13ceaa2420f5e7f7012c82892
This commit is contained in: