Merge changes from topics "replace_instead_of_append",...

Merge changes from topics "replace_instead_of_append", "selects_get_and_get_default" into main am: 42a8b256

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



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