Merge "Revert "apns: Add type default for Sprint."" into cm-11.0
(cherry picked from commit ba296d19066bd5263fc82a1dd8ce33fe0c5f7698)