Revert "Revert "Merge remote-tracking branch 'aosp/upstream-mast..."

Revert submission 3195752-revert-3061807-bcupdate-CHHXAMSFTB

Reason for revert: BouncyCastle update with errors fixed. A new frameworks cl has been added to fix the test that was failing.

Reverted changes: /q/submissionid:3195752-revert-3061807-bcupdate-CHHXAMSFTB

Change-Id: Ia0db01091b24292c5c1a4c183db0e15e171ef999
1489 files changed