Merge "APV Encoder: properly initialize frame holders and fix initializations" into main am: 78a4ab5e06 am: 6cfc614039

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

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