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