Merge "Update frameworks to use unbundled version of BouncyCastle." am: 9671b7eca8 am: f477bba3c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I573badb280d7e351dad049c94566a68f9498f730
tree: 2b3215acdc7bd456794d6ddd8ff1d50f22e6ba8c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS