Merge "Optimize buildPropFile()" into main am: 181a27986c

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

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