Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" am: b1e7ca32c6 am: 181f064c5b

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

Change-Id: I650345931c6624a7eed526572e36a70eedf77d77