Merge "Switch last c.a.i18n.phonenumbers hiddenapi entries to annotations"
am: 15152e7d95

Change-Id: I017bfd08a96e27768d3972ab80f4ca00b17cb60a