[automerger skipped] Merge "Add startNetworkScan 1.4 API." am: 312dce0ec0 am: 4eda2ffad6
am: 2c4bfe5aea -s ours
am skip reason: change_id If42e61fb30c4b482d4552f04f1934bd3c8d1a525 with SHA1 b7c86b6b4a is in history

Change-Id: I30a505fefb591fb9187f350a5afad6a41595e229