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

Change-Id: I047e5072d877368cfd71186aa2d1af6a70ae5ca4