tree b6e99be11f40f00e39f294864b2aa6177a571c30
parent 6953c3b0b006444c8d2827b2f4cdc16ea6605a8a
parent b124c7212cbf6a12bb1dd799bc7f74df165761ed
author Ian Kasprzak <iankaz@google.com> 1567205219 -0700
committer android-build-merger <android-build-merger@google.com> 1567205219 -0700

[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