[automerger skipped] Merge "[DO NOT MERGE] Include exclude-rules in all TEST_MAPPING config instances." into stage-aosp-master am: 4da2952342 -s ours am: b124c7212c am: fcfd1b5580
am: e8e29cec8b -s ours
am skip reason: subject contains skip directive

Change-Id: If6128b3b36c5c02a542634834765b4d01948745d