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

Change-Id: Id1b1667359a45259aea7d32cf7426f843ba0f33f