[automerger skipped] Merge "Re-land: exclude-rules in all TEST_MAPPING config instances with Q release." into stage-aosp-master am: bab44f41a6
am: 0d034d48f9 -s ours
am skip reason: change_id Ice3eb966a88e6de5bc8834b60b54bcac31bf31db with SHA1 0d1890b0e0 is in history

Change-Id: I14fae7fe1aec14d2d2cde2da81af1923726061f4