Merge "Use select syntax on from-text vs from-source static lib selection"...

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

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



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