Merge "Do not include selected output in secondary output list." into main am: 05c2c223af

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

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