[automerger skipped] Merge "Ensure priority apn list is sorted" am: da1050db...
[automerger skipped] Merge "Ensure priority apn list is sorted" am: da1050db am: 489b49d3 -s ours
am skip reason: Change-Id I724d5d5ccb1a49b6eb7cfe4b6c7e6597fef49a36 with SHA-1 001cf4a3 is in history
Change-Id: I9902f6beea88cd4a06cb7253839fce9a724fe0ff