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

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



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