[automerger skipped] Merge "Make string version of APN_TYPEs a @SystemApi" am:...
[automerger skipped] Merge "Make string version of APN_TYPEs a @SystemApi" am: 941ff72b am: 49232cca -s ours
am skip reason: Change-Id I1c344b3ff482d973b8bf51a33956a7f90f291634 with SHA-1 8bb56fc8 is in history
Change-Id: I3dcb9231665fa2c93182fb73fba048a7e279d217