[automerger skipped] Merge "Update startNetworkScan to use 1.5 HAL" am: d713df62 am: aaa51515
am: 90f2a04f -s ours
am skip reason: change_id I59e819b929bdd2dd6c52c4beba7c36379ed32b61 with SHA1 e4f661d4 is in history
Change-Id: Iab9c74bb2e3ca6569e523bf208388c65937321c6