Merge "Cricket merged with AIO, add APN" into cm-11.0