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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97000a9954fb8fa10bd5a3ea9973ca29fc6e5740