[automerger skipped] Merge "BLE: Don't start scan if the same Pi scan is running." into qt-qpr1-dev
am: 6f3c5b7a -s ours
am skip reason: change_id Id032025e1276cd87626bd81e235078820948d909 with SHA1 7b7f78b1 is in history
Change-Id: I9ddbc1a73385abd2b83d0ee3e95100ffc281ea8e