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

Change-Id: I25ad45c52cdcb9b4bf3d21f4f3b71c68e8ace362