Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."