Merge "Do not generate TEST_MAPPINGs for host tests" am: a727e45813 am: 54cea8b082 am: bb03d2eb6e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida989d5253bd6c6e44cd307768bb0fbffa51e818