[automerger skipped] Merge "[DO NOT MERGE] Include exclude-rules in all TEST_MAPPING config instances." into stage-aosp-master
am: 4da2952342 -s ours
am skip reason: subject contains skip directive
Change-Id: I4aba34d89854bc969f853ec2884dda87564e3293
This commit is contained in: