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

Change-Id: I0e8f612efcbcc36c17a1f543af5e488b1a83d1b8