Merge "Fix writing soong.variables ." am: 828b1e99ec

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

Change-Id: I80ae7c3fa8209791444ded7e611864ecc36c9256