Merge "Add new check in shouldAppendRowId in SQLiteQueryBuilder" into mainline-prod