Merge "[automerger skipped] Merge "mkdir .incomplete in backing storage to fix CTS/GTS failures" into android11-tests-dev am: f6e442814a -s ours" into android12-tests-dev