Merge "Tethering: support Local-only Hotspot mode for downstreams" am: d3128d4b55
am: 908ce167eb

Change-Id: I6e72a9b90e59ea5abd1dfa11c6c3d16a5c98751c