Merge "Switch last c.a.i18n.phonenumbers hiddenapi entries to annotations"