Merge "Fix VTS crash for getAvailableNetworks in Radio 1.6" am: 058de98e44 am: 90f0c0e3be

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1699825

Change-Id: I17209d9f01e8673f1e327968f20b2a0e75945e22