Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot."
am: c046f9f039

Change-Id: I362b05f32fc26a7233bd4dd26b3e941c8d2e9a46