[3.13] gh-116622: Android test script improvements (GH-124012)#124034