Merge "Add constants for AllowedNetworkTypeBitmap" am: 7dabd13456 am: 4f00a18d09

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfbf2cb95eadd4ae9e160adb0c14cec5d867e6ec