Merge "Re-land: exclude-rules in all TEST_MAPPING config instances with Q release." into stage-aosp-master
am: bab44f41a6

Change-Id: I6794ef61f96053d08f507bac1a77514eda15594a