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

Change-Id: I5c673ed38b1f2bf95b5cc3e0385a9f6afce9afa5