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

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

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