Merge "Fix apn option display issue for world phone mode" am: bd2f440b71
am: d44a794e85

Change-Id: Id7f7090026e74b532539c05396c96af1c1a35a7e