Merge "World Phone Support in testTelephonyFeatures" into froyo