Merge "Let cargo2android.py generate data properties for tests." am: d832c85b2e am: fd8d202caa

Original change: https://android-review.googlesource.com/c/platform/development/+/1771789

Change-Id: I9bbc027d3b84addb5b368395fda530932c74c596