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

Change-Id: I886fe6800c1caeb2b0438e9b638f5305ba7ef7de