[automerger skipped] Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 am: dfcd502487 am: d5d27c5e08 am: 6092d39f69 -s ours

am skip reason: Change-Id I8b65f621abe20799a3a0d410ba1f06368746ee49 with SHA-1 8c98b3d35e is in history

Change-Id: I47b7dc9f234445f08a1aba09243fac07e14dca7e
tree: f255062e3b99073f41f5525db526f5980ba212a4
  1. Tethering/