[automerger skipped] Merge "VTS fix for getAllowedNetworkTypesBitmap and...

[automerger skipped] Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" into sc-v2-dev am: cc961346 -s ours

am skip reason: Merged-In I0b50e7e6c0d406a62f7a1e2ea8ac9bc3a71d8aeb with SHA-1 20aa01c2 is already in history

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

Change-Id: Iec201f0a357a6873a97fda399cab10e198f31caf