[automerger skipped] Merge "Do not stop IpServer when recieve wifi ap...

[automerger skipped] Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f am: ef155a6c am: d5d27c5e am: c44e719b -s ours am: 93870361 -s ours

am skip reason: Change-Id I8b65f621abe20799a3a0d410ba1f06368746ee49 with SHA-1 19487bfd is in history

Change-Id: Id023687b7499fb1dcda3038c94918322e2b37d52