Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1""
tree: 378ce83f1fdd68aabb76fb96d7363d58baf82f58
  1. core/
  2. services/