Merge "CCodec: handle attaching 0-sized encrypted buffer" into tm-dev am:...

Merge "CCodec: handle attaching 0-sized encrypted buffer" into tm-dev am: 8236387d am: a58f4ab4 am: 17cd1b67 am: 1c229485

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



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