Merge "Support select in combined_apis properties" into main am: d233693601

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3182455

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