Merge "Generate TEST_MAPPING for test modules in .bp file" am: 8bc86ab02a am: 2dbc4c6946 am: 7064d36a09 am: 3c6bcf1829

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

Change-Id: I1e9ebf6726123558609c263709225113a41056d7