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

Change-Id: I93fa34def495a9b05643d683e8f1b20b75f66be8