Merge "Update non-user-facing properties to be mutated" am: f58396a4c7 am: 7f73e5831e

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

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