Merge "Fix more VTS HAL Radio tests" am: fe30db5e3d
am: 5401fe91a0

Change-Id: I480c2b1af55542acee823d7e982a127588d4cab1