Merge "Skip tests for single SIM devices" into android11-tests-dev