Merge "Better javadoc and rename several methods in ApnSetting." am: 5d9544cbea am: 2e8ebcf09b
am: cd875b587b

Change-Id: I5403a2d0947176275a64397910eb6e2ca8a2a5d6