Merge "bp2build data property -> data attr in gensrcs" am: 86c7300bf3 am: ce8670a392 am: 26b1878d8d am: 7df84dbe4e

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

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