[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

Change-Id: I57ae94e2715957280d3250a915399cebb7444e9b