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

Change-Id: I321677cd1dee2ddc930e184a55f801845c799d32