Merge "Fix SimStatus updatePhoneInfos" into nyc-dev