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

Change-Id: I3da6797d85e8271aab093e98a5a757f38f87e931