[automerger skipped] Merge "Added disallowed APN types configuration support" am: 13b0b1a73d am: b0bd8bedad
am: 639621cc19 -s ours
am skip reason: change_id I63c44d1e774b7491929406929e1a5a556db9515a with SHA1 ac9a731d27 is in history

Change-Id: I75b05298046bc9af6cc75c6b07b5fe9857a7cfac