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