[automerger skipped] Merge "Fix LocalOnlyHotspotReservation double stop of local hotspot." into qt-qpr1-dev am: c73945bd84 -s ours
am: 35de27ee64 -s ours
am skip reason: change_id I86c10b577dbab8cad2d5f7e19805511a93bcb668 with SHA1 ee7b0a6ab2 is in history

Change-Id: I83e99b62b833eb80299992be646c206fe9ffef3b