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

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

Change-Id: Iefaf60fc986252e253d533be55c52d6557df7886