Merge "Add a CipherManager for en/decryption using AndroidCrypto" into udc-dev am: b74fcc25 am: e8c11a4d

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



Change-Id: Ib3a20a8c5a6e4a75caca384c42df75d4fcd900d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>