Merge "Split up locktask reboot CTS" into stage-aosp-pi-cts-dev