Merge "Add a CipherManager for en/decryption using AndroidCrypto" into udc-dev