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

Change-Id: I230fa770f58aa5df37cb4745557d7dbcf89d12ef