[automerger skipped] Merge "Use setAllowedNetworkTypesBitmap" am: 6ec31899...

[automerger skipped] Merge "Use setAllowedNetworkTypesBitmap" am: 6ec31899 am: 14b3375d am: 2b79aa79 -s ours am: 5ae2775a -s ours

am skip reason: skip tag Change-Id I40639022b9a367b393638534cf50ac49ec826d12 with SHA-1 5f5c65d9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1642004

Change-Id: Ia768930debd64ec412e220dcd1e20331cd1b949c