Merge "Add function to get APN types as ints from bitmask" into sc-dev