Merge "Convert some properties to Configurable properties" into main am: c6b5fdbc am: 655c526e

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



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