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

Change-Id: Ib253d6c2ebcf2fcef709354dbfa96bb01e0a88ae