Merge "Cargo2Android: add rdep tests to TEST_MAPPING" am: 917272ab42 am: bda76dde0f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49175aeb5aa54dc5ad6b17e901ef70c9b0258847