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

Change-Id: I2aca4f234b70a1ec49f459ef2ae58ec52126cb78