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
am: e5a9d3c71a  -s ours

Change-Id: Ie9269855209d4cbda883f0384873387ed797b14e