Merge "Remove internal ApnSetting." into pi-dev-plus-aosp
am: 1969c54ae2

Change-Id: Ifaa873daa4bf60e5ddc9b8acef8b826ac787582a