Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb am: 36adf13e62

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I573badb280d7e351dad049c94566a68f9498f730