Android VTS 8.0 Release 2 (4339158)
Merge "Fix APNs for Cyprus" am: 6e0aa95952 am: bb04473907
am: ae3e9a61af

Change-Id: I3757ea35830af84ba0ff906a9f5797545d3070be