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

Change-Id: I0f3ebf286462641d2c86ebffd49d95ce30056662