Clean up Japanese APNs

 * Rename and rearrange Japanese APNs to make intelligible.

Change-Id: I628012eb5a2cdc1b4e95ca9a6cf1eaa88eb88b31
Add apns/eri for Boost Mobile

Change-Id: I01bb82afe9a7a35d0a309491fe96da34655ec9c3
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy