Merge "Make the android-test-mock-current.txt available for use by the /vendor tests" into main