Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Move AOSP CTS tests to the correct files based on bulletin month" into oreo-cts-dev am: 7b344ea8 -s ours" into oreo-mr1-cts-dev am: e5a9d3c7 -s ours" into pie-cts-dev