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

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



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