[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting...
[automerger skipped] Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS. am: ce3d4298 -s ours
am: 8efa3536 -s ours
Change-Id: Iee13564cbfd41b291ec4eb1020ba76d141ce244b