Merge "[DO NOT MERGE] Improvements to resume-on-reboot CTS test stability" into stage-aosp-udc-ts-dev