[automerger skipped] Merge "Added configurable priority on apn types" am:...
[automerger skipped] Merge "Added configurable priority on apn types" am: 75c77f6a am: 8f145348 -s ours
am skip reason: Change-Id If4a0cd1097393b8aba7806b53cdd1c3130fab0d6 with SHA-1 c21b579c is in history
Change-Id: Ib4c78e5db206f377cbfe9039892840462c515457