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

Change-Id: Ia7c35d8daeb6c72f43e32215a5af0c0ccfda3e15