Merge "Expose a new public column network_type_bitmask and deprecate...
Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 89587ddc am: 7f067cc7
am: d9130372
Change-Id: I953907ba5729016f33674e1647533f29b203b1be