Merge "Add version check to prevent test fail on Android Q"
tree: dbf3912b9ab05f2b67669aec8a52712a79d23389
  1. core/
  2. services/
  3. tests/