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

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



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