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

Change-Id: If39b82b838f2a71a69f32eba98320726758642fe