am 30431a4d: am 0255f595: Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev

* commit '30431a4dbd6985014c87e4a8aca5d04761433e9f':
  ApnEditor changes to support bearer as a bitmask.