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

Change-Id: I99f7ff69ea763ee4d9f04d96c3e91620dceb0fae