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

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

Change-Id: Ia2215c4429ba1421641c21c77d6635a58b1bbb41