[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

Change-Id: I29ff2c9de72a1fc4b190184b4ae11b13e4c68b14