[automerger skipped] Merge "Add/update unit tests for APN types that are not...
[automerger skipped] Merge "Add/update unit tests for APN types that are not wild cardable." am: 6a71c891
am: 606b316d -s ours
am skip reason: change_id I8129d344247645711635b6ed4a218d38f220ad2b with SHA1 a65ce11d is in history
Change-Id: Iaeca830e3210c934fedc5f5ba1f8d95fe74816f1