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

Change-Id: I1aae00b38399a64ff5ce20e6cdfedc8c8c8dbfb3