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: d3dc29cef7 -s ours

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

Change-Id: Ifef3532e51f913be0487949f92eb6199abae27c1
tree: de88eb9e691531d4bfe03ebbdb9ca8f4f2e9aa52
  1. Tethering/