Used APN type instead of APN id

APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.

Test: Telephony sanity tests + unit tests
Bug: 77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit f42d06010a522b0d519df1a2ce9fa5ba3aefb51f)
2 files changed