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

Change-Id: Ia2d8ffdeb173b7e5d1cca66edb7ae9ad020e683c