Android O IOT Preview 8 (4718959)
Merge "APN changes requested by EE"