Merge "Reland "Deprecate `setDatabaseEnabled` and `getDatabaseEnabled`"" into main