Merge "Add values to json module graph" am: 4242115d am: 9fadff9a am: feda277e

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



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