[automerger skipped] Merge "Update documentation of ApnSetting with V5 example" am: 1c0ef18c39 am: 3ae696bff2  -s ours
am: 3d06720c7d  -s ours

Change-Id: I3a781ba7451a33588e12a5c3599aa8de546759f6