[3.13] gh-144415: Android testbed fixes (GH-142912)#144417

freakboy3742 merged 2 commits intopython:3.13python/cpython:3.13from

miss-islington:backport-cb1dc91-3.13miss-islington/cpython:backport-cb1dc91-3.13Copy head branch name to clipboard