Clean up apns-conf.xml

Change-Id: Ib7706a2cb690a4e3673b60067208daea6aee27c6
Add Japanese translation contributor

Change-Id: If343a20f5b3ce377084e607c853636329bae3a7e
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0