Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 72acefa6d8
am: b51df90f28

Change-Id: I7045d6b684351e3545d24a52d16cb53d85483f20