Merge "Let cargo2android.py generate data properties for tests." am: d832c85b2e am: fd8d202caa am: 5fffe99068 am: 96c3826a4f

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

Change-Id: I6ef9eb4d840fcd0287ad136322059385767845b9