[automerger skipped] Merge "Add setAllowedNetworkTypeBitmap" am: 2df6ba0ac2 am: 070457b063 am: c4d7cca8c3 am: ea6454c76d -s ours

am skip reason: Change-Id I7f5fdf9bf5a80c47e9ad838b740b2d6e40ffea60 with SHA-1 ed5c514ed1 is in history

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

Change-Id: I7274515929f6322b36b5b26affeda74187bf0b36