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

Change-Id: I16bf7937aff06c47c8719e08c267c3649305ec66