Merge "Avoid incomplete OutputConfiguration definition" into main am: dd9fbf4c70 am: a6330bc9c9

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

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