Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime" am: 3c8f624724
am: aad649b8df

Change-Id: I44287c0d85a4c15804092321d2dd5f532757f2b9