Merge "Remove wrong apn for YOTA" into android-9.0