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

Change-Id: Ib2a29ee6b83638fce0ca737f636bb284de1d8185