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

Change-Id: If856c76531d329e7beac3d0b4902ecf46a7c8b6d