Merge "Change to treat no bearer_bitmask specified in APNs xml as bitmask 0." into nyc-dev