Merge "ApnEditor changes to support bearer as a bitmask." into mnc-dev