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

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



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