Merge "CTS test race condition on the memory puller atoms" into android10-tests-dev