Merge "goldfish-ril: delay updating voice/data registration"