Merge "Restrict test to  not require features that all devices may not support" into android13-tests-dev