Merge "Better javadoc and rename several methods in ApnSetting." into pi-dev
am: 5d5d6aa28a

Change-Id: Ifaae67cd03bd979e3aeb40f3a077bdb36d5911e6