Merge "Add version check to prevent test fail on Android Q"