Merge "Update select tests for optionals" into main am: 4ab1563f

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094707



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