Merge "cargo2android.py: Default to vendor + product" am: e0447d38ef

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

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