Merge "Test CipherInputStream with growing Cipher.getOutputSize()"
am: 6e9f7ca6f4

Change-Id: Ia77db0253da7351c9a4a99bfa050ff16e3b34d70