Merge "Remove com.android.bouncycastle.... classes from light grey list"
am: cacc09018b

Change-Id: I4202bd320fe4a67c67d78fe48315289d4976f059