Merge "Make string version of APN_TYPEs a @SystemApi" am: 941ff72b3b

Change-Id: Id9fa0069b704ea9cf78782f4c13c4fec47752954