Merge "Fix RadioHidlTest_v1_2.startNetworkScan maxSearchTime"