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

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

Change-Id: Ie6d48d7bdc1ecf5f40cfba9d9ffdd12fbfd59c4a