Merge "Add setAllowedNetworkTypeBitmap" am: 2df6ba0ac2 am: 070457b063

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

Change-Id: I7bc256e77720157d2e6a8152c039a6bd0366fc2d