Merge "Remove android.icu.... classes from light grey list" am: c6b17ad431
am: 1519c387e7

Change-Id: If1d84299aada7dd3f86d4006a781e9af7a1baaa7