[automerger skipped] Merge "Add function to get APN types as ints from...

[automerger skipped] Merge "Add function to get APN types as ints from bitmask" am: f9bf0a69 am: e75751d8 -s ours

am skip reason: Merged-In I473b6bc3341bc3782b9c53eeca58c2ede18b6702 with SHA-1 6ca27717 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729424

Change-Id: I970e21a9692540981fac6a2f8900fb88bbbda99b