Merge "Remove com.android.i18n.phonenumbers.... classes from light grey list"
am: d44e26bc69

Change-Id: Ie594118b39d66fd91ffb449c9dd72c57905c2c16