Merge "StopScan before each new Companion device scan" into oc-dev
am: 611797073f

Change-Id: Ia4d72f6e6d7a1073120152004ea7808636817d0e