Merge "Add property data to gensrcs for additional inputs" am: 268926aaaa am: b9d5e907bf am: 1fbe03868b am: d96bed7f1d am: 8a9a558a8c

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

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