[automerger skipped] Merge "Do not include selected output in secondary output list." into main am: 05c2c223 am: f6cfc585 -s ours

am skip reason: Merged-In I629303ad5ee2e2ddf3f65edc9875e310d8048b21 with SHA-1 6838cdad is already in history

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



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