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