Merge "Increase shell timeout for hidden-api tests" into android14-tests-dev