Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." am: c046f9f039 am: aa562f6dc3 am: 48f566d5a9
am: d0ba20f11b

Change-Id: Ic3c6e17283f0f937af31cc4f5c69dbf9e73b69e5