Merge "Switch last c.a.i18n.phonenumbers hiddenapi entries to annotations" am: 15152e7d am: f0e9bc79 am: 37d00de3 Change-Id: If39b82b838f2a71a69f32eba98320726758642fe