Merge "Add eRate apn to sample apns - now with gid" am: 4a7e8e2b45

Original change: https://android-review.googlesource.com/c/device/sample/+/1906275

Change-Id: I87dd59ec2d4f930b19dcccb7b311a489c834cfa7