Merge "[RESTRICT AUTOMERGE] Fix GSI Crashes" into android13-tests-dev