Merge "[automerger skipped] Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 -s ours am: 59b47f9fca -s ours" into rvc-d1-dev-plus-aosp am: 2f221beb8d -s ours

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

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