Merge "Increase the timeout to 6s when ApkChecksum getResult" into android13-tests-dev