Merge "[automerger skipped] Merge "Add option to set shell-timeout to 20 minutes in AndroidTest.xml" into android11-tests-dev am: c337ef98af -s ours" into android12-tests-dev