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

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

Change-Id: I2a3d986de29e24ee28ea456cf36d93919bd1ff05