[automerger skipped] Merge "move IApnSourceService.aidl to android.service.carrier" am: adb195be47 am: 8a8fbdcb16 am: e92aea83b0 -s ours
am skip reason: Change-Id I1c980fc5a40afd53c9b527ee0e47c407e4163030 with SHA-1 9e3e019b60 is in history

Change-Id: I3cf349ae2427d388827c0c57e3a85c6317243aa3