Merge "Update imports to android.health.connect"