Merge "VTS: fix RadioHidlTest.getAvailableNetworks issue" am: 89b2d24fb0
am: 0c9df89f88

Change-Id: I5c59f4e1964bdbd387031a13290b52352af4e172