Merge "Keystore2-client-tests: VTS compatibility for older devices Android-13 and earlier." into android15-tests-dev