Merge "Use select syntax on from-text vs from-source static lib selection" into main am: 6caaf2f3

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



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