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